moved all classes into seperate files, made getters and setters