[BUG #7279] some code clean-up
[BUG #6968] moved applications to @-hints
[BUG #6968] migrated components to @-hints