add some org configuration
clean up deleted garbage