Removed simple stuff
Changed folder structure