project structure fixes