Namespace Issues

Updated the classes to use the astateful namespace.