fix some of the exporting
rename file remove require to old location
Merge pull request #88 from aspett/feature/76-fix_some_exporting

Feature/76 fix some exporting