Move matrix-related code to separated service
Move files to appropriate directories