Fix for package structure