Refactoring of the testing and the folder structure.