Refactored to a Package structure
Restructured the project to use unit testing