Created new namespaces and organized classes.