renamed packages for tests and utilities