Java 8-ified; rename packages
Java 8-ified; rename packages