Some cleanup
Added functionality to rename contents of a flat directory