General Directory/Menu Consolidation - **INCOMPLETE**

Various and widespread directory and menu consolidations.
**Incomplete** Options beyond 7,6 are NONFUNCTIONAL
Last functional menu item is 7,6 (Install GApps ICS/JB)
Temporary Push to ensure no work thus far is lost

Signed-off-by: David Long <david.long@canonicaldev.com>