fixed git trouble due to file moves