Made the whole thing a proper package.