Refactoring data organization