Restructure the folder hierarchy in the test directory in line with suggestions from modularity stream work and get consensus from the team.

All the test code is to be under the test directory.
Suggested to have tests related to a particular module under the module directory folder.