cleaned up directory structure.