Remove base module, move Mixin classes to baseui
Fix broken tests