v0.9.5.5.2.c

python restructuring
slight java restructuring
cleanup