reorganised some files, abstracted health component, I think I'm starting to get somewhere with my architecture