code re-structure, ng-material