register adapters; move adapters to separate packages; etc.