Complete Move to 1.6.4

Complete refractor to MC 1.6.4
Refactoring the Pacakges
Updating Code