DEP-38 components location fixes, better xml creation
Merge pull request #24 from maciejborkowski/dev

DEP-38 components location fixes, better xml creation