better hearbeat data
project restructure