Reorganized
Merged Maintenance, Uses cases. Updated links. Fixed unmatched names
fixed up conflicts