Update: Refactoring for new application

Refactoring in progress
Application not ready