[WindowMaker] Started working on WindowMaker refactor