Huge edit and reorganization