Upgrading project structure for jdk8