Move adapters and fix ViewHolder patterns