Inline different files

after all, the revisioneer usecase is too small to split it up