Moved the sub class one level down in the file system