Added folder for tests
Renamed package to the right thing