updating package structure for tests