Fix File and Folder Structure, Adjust Parameter passing from pass-by-value to pass-by-reference