Refactoring, especially namespaces just to keep it easy for myself.