Merge components and common directories
Merge pull request #14 from gickowic/master

Merge components and common directories