Implement atlasing and new config format