move around package structure a bit
move delete into operation class