Huge refactor. Much seperation. Ore dictionary in some stuff.

I ain't even done yet :P