reorg of java source files