rearrange tests folders add individual module test