Renamed some stuff and moved stuff into seperate files
Deleted some unused stuff