Reorganizing to package
Packaging code