Clean tests folders structure
Add modules namespace prefix