Added RunExpt classes and refactored project to use them