restructured include structure