Added missing folders
Added FormTypes