cleaned up folder structure in java/src