Fixed errors in path and renamed classes.