Updated fs and fixed namespaces.