adding cielo and organizing code