fix up project structure