split fs-state back into seperate tools