Refactor Applications painting
Massive refactor: changing package naming convention