Refactored entire project after Cespy update