Upgrade to ADT 22
Refactoring project structure