new dir structure to make proper tests.