Rearranged file stucture