Updated package contents with a better structure