Cleanup, begin reorganizing, fix adb