Refactoring and updating to forge 953

Reorganizing packages to be more clear on class hierarchy.
Updating to Forge 953 for MC 1.6.4