Move demo classes to test folder
Use Java 7 and UTF-8 for sources