Fixed issues with correct package structure in multiple instances.