uniformized project structure a bit