Rename to make it an individual package