adding file structure, removing pkgs