moving tests into package folder
rearanging imports