rearranged directory structre