minimal, minor in FS
remove inline - no need atm
merge fs.h