Addded namespaces, whitespace cleanup
Removed old files