re-structure
more packages
git packages
to use veriables