updated code and structure to take advantage of meteorite 6.0