Changed the Directory Construction for the packages.