Made a start with sorting files into packages