Shift files into packages, for readability