refactor to handle celestrium's new structure due to ci