minor project structure fixes