Little folder restructure for forms