Fixed all current errors.
Updated Namespaces