Big application refactoring