Simplified the directory structure.