Moved some classes around, made the screens/menues-system easier for future use.