Start refactoring
Moving tests in a folder