Major reorganization including the final choice for a standard class model