took advantage of new autoload feature in 2.3.1