rearranged file structure