Moved the classes up one level