re-order module loading order, closes #272

re-order module loading order, closes #272
Merge remote-tracking branch 'origin/issue272' into ci