o cleaning up after initial merge of repository layout configuration. i will squash this into a single commit after more review.