Actually the way you have it now is exactly as the data should be stored. This way it is very easy to summarize data and present it in the right way.