Restructure remove fs. prefix