Move the 3 pkgs to complete subdirs , fix a couple bugs