Added run instructions and renamed classes