Removing Java 7 dependencies and adding support for building eclipse project