Update to use new dependency_injection library
Update to use new filesystem_tree library