Convert project to be Java 6 compatible