Reorganized the various files into packages