Make into a more proper package.