cleanup: project code/file reorganization