Organize the files into packages
Merge pull request #167 from calblueprint/mark/base-base-request

Organize the files into packages