Shuffled files
More file shuffling!
Broke the Engine into it's own object