Refactoring current structure