reorganize the whole repo for easier packing