Cleaned up Directory Structure.