Restructured file-organization

 Restructured file organization and layout.  Deleted previous directories, changed names, and combined files.