rearranged file hierarchy