fixes
split calipso module into several files