More organization, some renaming