restructured forms folder