Moving around some stuff
Merge pull request #1387 from Kenneth-T-Moore/hifi

Moving around some stuff