Upgrade to YeoMan + Refactoring