restructure for folsom