Refactoring App Factory tools.
Merge pull request #102 from kaviththiranga/developer-studio-3.7.0

Refactoring App Factory tools.