[other] reorgnize directory hierachy