Refactoring

package configuration change.