Reverting hw01 to old status
Switching to new (internal) class system