Moved it into a new package