Cleaned up directory structure.