Fixed Deviouslrd#5 and Deviouslrd#8

Fixed some critical issues, mostly regarding models and its file stru…

…cture, as well as making some tweaks

last minute tweak before building a release