Changing the package structure