Updating some references to package assets and using correct controller