Changed the directory structure.

Changed the directory structure to conform to the new folder/file naming
convention for the project.