some restructuring. more changes ahead.