Drop custom autoloader and bump to 2.x