Refactored structures package.