Added applications and refactored tool modules
merge