give the package a better structure