project structure simplification p2.
Removed temporary files.
Code formating aplied.