move source dirs up to match
shifting files into packages