Moved adapters to correct package