Fixed some filename and folder errors