Merge pull request #8 from Webiny/master

Component refactored