Fix Gradle build files to correctly include or not include dependencies
Remove remaining resources for SBT support
Remove experimental upper classes classes (moved to the appropriate module)