Merged in Mining mod classes, without using git tree method