Apply requested changes in design and structure (refs #274)