moved dir struc to reflect some order