Nomenclature

Moved files and folders to fix organizational structure.