Phisical structure refactoring