Refactoring builder and factory... Creating components for basic structural elements.