restructure wclass project