S 3 package names

fixes issue 3