Deleted unnecessary things, reworked filestructure