Regrouped files into packages and grouped imports