Updated to use gradle and renamed modules to match naming convention