Adding classes to make organisation