Removing non-needed classes.  Moved session impls to correct locations.