Reorganize files, and starting to play with DataMatrix