Split up the FF modules a bit