Some reshuffling to make LH5 support standard.
Merge pull request #227 from kyleabeauchamp/lh5_no_import

Some reshuffling to make LH5 support standard.