Make class directory structure standard