[RFC] Initial Reordering + some unsorted options

There are still unsorted options, but I don't really know where they belong.

Also I have a lot of "Subsections". I hope they're not to many of them.

Please voice your opinion

EDIT: REF #222