reorganized hierarchy
initial commit