Refactor FS structure