Removing redundant folder level