minor improvements to project structure