Modified autoload and test_Trooper to work new structure.