Bugfixes and change the files again into folders