Eliminate package name.dargiri. Move all the stuff to upper levels
Fix bug - preserve ordering and joins.