Organise includes by namespace folders/files