Refactored namespaces and other WIP