Adjust so that class names match file hierachy.