Issue #66: Refactor engine and adapter relationship

Signed-off-by: Lucas Fernandes de Oliveira <lfoliveira@inf.ufpr.br>
4 jobs for issue/66 in 1 minute and 8 seconds (queued for 4 seconds)