Refactorung structure