Feat/reorganize code

I think we should land first bitmask-systray!50 so we can test this properly.

Up to now I only tested the windows cross build.