Started separating windows classes