fix npe in getHeartbeatId
new dir structure
new dir structure (2)
new dir structure (3)