re factoring package to simplify deployment