Moves to new file structure