Change directory structure to match new naming convention