Fluid changes

[melcher....@googlemail.com]

Sorry for so many changes spread over the day. That was not the smartest approach. I hope I did not do harmful changes in the core. If I did, please let me know and I can reverse stuff. ;-)

I will continue the restructuring and cleanup in my private repo and merge back later and keep the core alone for now.