Merged and cleaned up directory structure.