Changes in package structure done