First round of refactoring cm into L-Droid