split up classes file a bit more