First round of changes, mostly definitions and organization