DEP-45 component placement change
Merge pull request #44 from maciejborkowski/dev

DEP-45 component placement change