update filesystem structure and tests