Project update to work in eclipse (prior to Gradle transfer)