#ZC-157 in progress
registry start of other classes
fix project structure