Refactored filesystem, merged files, many changes.