Application structure massive refactoring