Huge refactoring is done