General Cleanup

Cleaning up some unused packages and code from the theme. Initially
created the single organizations layout.