Reorganizing directory structures and adding preprocessor definitions for simplifying header-file inclusion.