Fix files missing after refactoring. Update to 2.2.2-SNAPSHOT