Merge pull request #5 from xopherdeep/master

Updating with fork
Merge pull request #6 from xopherdeep/master

updated templates
removed directories
Merge pull request #17 from XenGenie/master

Removed Dirs