Reorganaize the directory structure.
Modified files to match new directory structure.