Huge refactor. Much seperation. Ore dictionary in some stuff.
Merge pull request #2 from xbony2/master

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