Move around files
Fixed issues with overlapping URL entites