Change module structure, consolidate site data objects.
typo fix