More FM methods added

Rename fmm2 folder to fm2