Cleanup

Reorganization of file structure