Added FunDefs
Removed FunDec
Fixed statements w.r.t. Declarators