Changes for Qt
Refactoring project