Some updates to carousel.  Reorganization to get some boilerplate architecture code done.