Split out fs / js. Unbreak things