Add refactoring
* starting to cleanup a bit and make use of namespaces