unify common files, build system