update package structure, names and tests