cleanup: project code organization