Fixed directory structure to match Cleaver standard.