Moved it to an appropriate package