Moving harness directory into class itself
Changing name once again to be more semantic