more organized java files now