Rearranged file structure a bit