changed dir structure to add java dir to main and test