Changed hosting code, more reorganizing