renamed classes, added new creation methods to workout