Adds namespaces, improves code modularity