Re-Organized java files