Moved the classes