Cleanup, begin reorganizing, fix adb
Merge pull request #1 from CM10DNA/cm-10.1-chad

Cleanup, begin reorganizing, fix adb