Update for MC 1.7.5 & organize imports