Refactored the Org code to be more like the Idea code. Fixed deleting comments. Some other stuff