FS Refactor and cleaned up unnecessary files