Abhinav: Moving Adapters to a separate package.