updated package location
moved tests to tests folder