rearranged file heiarchy