Reorganize folders
Shifted java files into different folders
merged