next step
some logic updates
Merge remote-tracking branch 'origin/master'
final structure - part 1
final structure - part 2