Attempts to reorganize the file structure and break out logical chunks into their own files.