Autoload and constants file fix