Refactored noodle.core.fs