updated project code organization