Renamed both modules and set up testing directory