Refactore structure