Refactoring & new module: APP.GUI