Reorganized the directory structure to be cleaner at the root level.