rearrange tests to match src directory structure