clean up: unify style, move to sub dir, prepare for merge