Placing all the structure in MODULE_IO
Fixed issues with the tests
Merge branch 'Amanda'