FS for marvin refactoring

Signed-off-by: Prasanna Santhanam <tsp@apache.org>