Added .java to files that Bladeking didn't

fixed formatting
Begin Updating to 1.6.1
And more
Towards 1.6.2

Cleaned up blade's workspace, renamed some .javas, and resolved my
"client" & "common packages