Split the code into multiple packages
Update test package