Deep refactoring to hold Droid components