Code reformatting. Directory rename bug fix