delete tons of stuff, and reorganize java code