Move internal datastructures below public ones