Refactoring to get vFense apps in place.