Change paths
Update paths, make harbour safe
Remove old spec