Refactored the existing files into packages, and added all of the other class files