Some declarations moved inside blocks.
Fixed logical structure of Fs classes.
Renamed class header generation macro.
Changed directory structure.