Move to a proper package