moved into packages
Created testDriving and modified files to work
added more tests