Refactor to correct package