Changed the hierarchy of test modules

Smaller modules, in multiple folders: enhances readability