Restructured include and loader modules.