Added some sites, reorganized packages