added structure to implementation and evaluation