Fixing project structure a little bit.