NBW Structure Refactoring