Refactored file loading
Merge pull request #116 from GrahamCampbell/include-factories-files

Refactored file loading