Consistent file loading and namespace conventions
Merge pull request #27 from janders223/patch-1

Consistent file loading and namespace conventions