Move modules/ to packages/, other fixes