rename variables, fix test package of test resources, declare internal structure as private structure