Move common elements to includes
Merge pull request #69 from dreamteam69/master

Move common elements to includes