do some reorganization and prepare to begin a weird site-class model