Changed abstract computation classes to modules