Massive restructuring of directory structure for clarity.