Improved Models, and more

autloading, renamed classes, all-around better code