Restructure directory, add 'pkgs' folder now