Refactoring and remake of structure in Application