Organized the files into packages