Modernize the package a bit