Huge refactoring of architecture started