Change to java standard structure