A bit of moving

- Moved more functions to the non-HR module