Stupid commit.

Cleaning in process...
Include is at the moment BROKEN and very DIRTY!

..but, it is finally getting to a direction it should be in future.
Hoping to get the cleaning finished as soon as possible.