Initial reorganization of files
Commenting out namespace and use declarations
Passing tests