Folder-Structure and Bugfixing

Changed the folder structure and fixxed some bugs