Move the new classes to a more appropriate place (menus folder)