Reorganization of repository layout

This is a minor change. Folder names changes to adhere to the new conventions. Please revise and pull into master.