Fix for package structure

Fix for package structure