Reformatted and fixed imports for EVERYTHING
Ported all items to 1.6.4