Clean up. Comments fixing.
Rename. Clean up of stupid stuff.
Fixed namespace naming according to coding style.
Source code tree corrected
Newline at the end of file