Populate with first structure.

Including mspaulding's commits (bar package changes).