Switch to gradle, facelift and performance tuning