Merge "Created WindowFrames class and moved data from PWM and WS"