Organize tests to match src directory layout