Project structure clean up.