Project structure changes. Code style fixes.