Heartbeat manager improvements and now only one files folder.