Updated to new source file organization and latest Rascal.