PreAggregate update + layout

Added files for all subsections of Set Up