[master] Project structure improvements