Updated marvin plugin package structure