Code cleanup and comments.
Removing unsed files. Slight namespace refactoring