remove demo
remove site
revert to java 6
change package declaration