Move presenterClass and collectionClass down to base