Namespace changes. Removed code that was only useful in another project, and not general enough