reorganized structure

more cleaning to come.