Restructured the package for Project #01