Moved everything to new files
Neue Aenderungen drin