Cleaning up file definitions, flatterning templates directory structure
and reducing dependencies.
Merge pull request #6 from ehelms/cleanup

Cleaning up file definitions, flatterning templates directory structure