Adds template template arguments for `matrix` template class

Storage and organizator should be defined as template template arguments instead of simply template arguments. This improves readability and writability.