Removed stupid package structure in lab 3