reorder, add inliner and docs