Resolved issues "Structure" and "Mock-up"

@CommanderHamster
~requested 250

issue #1 #2