Moves files and fixed a bug. moves half the files now. still a bug somewhere