Removing unnecessary folder level