minor changes with project structure