Change project structure a little