Initial attempt to bring in line with GlobalMarket api
classpath and project updates