Reverting to proper Arduino file name and folder structure