Refactor to L-Droid