Restructured Window class, removed copy of pc folder