general cleanup. whitespace, comments, less reordering, file renaming fo...

...r sanity