Organise and rationalise includes
Tidy up