added java files
Merge branch 'billy' into kati_n
refactored Route