nixpkgs: Reorganize and add new packages