Big Reformat/Organization/Cleanup

This is a big PR.

Code standard is important, so, lets keep it to one. This was done automagically via Intellij. It uses the same settings that I have done in previous PRs. 

This helps to maintain a coding standard, as it bugged me.

*Personally, the rearrange feature is epic*