Grouped common include files under base directory and added stubs for i18n support