Went from using a single module to a package instead.