new adaptor loaders, major change to code layout