more updates to project structure