Some renaming; code style.
Refactored dependencies and app loading.