changes for the new autoloader and corrected namespaces in literals.