File tree reorganisation, for better maintenance.