reorganization, project 1 base code