rearrange directory to add tests