structure refactoring + clustering model structure