Fixed over written and incorrectly placed files