Refactor namespaces & directory structure