fix Makefile
fix Makefile
move java
move packages to OG
remove postgresql
checkpoint