more reorginization
moveing to underscored names
some more refactoring