Improving project structure a little bit