reorganized and renamed stuff to increase consistency, etc. All works