more simplifications and reorganization - preparing for big changes