Some cleanup and added files from onearth repo