Some moving around of stuff (packages, some helper functions, etc)