many changes

-sorting out MVC
-better class structure