Organize into a package instead of a module