Added source and pkgs into a different directory