CONN-1034: Changed package structure, reverted to 3.0.1 RI entities
CONN-1034: Changed package structure, reverted to 3.0.1 RI entities (part 2)