#3 change the structure adding test and scripts