Restructured classes in lab #2