integrate operators with computation + cleaner files + more specs