Refactored namespaces and file names