Code refactoring. Main class is now MainGui