moved structures to another package, more tests