Made service files deployment independent; Fixed conflict with NextGEN gallery