[FIX] paths, [ADD] filesystem