Changed the class names so that they match the directory structure