Rename moduls, PEP8
Unit test
Edits for change matrix format.