merged files, added common window+control class