Changing some messaging
Signed-off-by: ArchimedesPi <archimedespi3141@gmail.com>
Got most restructure, tests done
Signed-off-by: ArchimedesPi <archimedespi3141@gmail.com>