- minor code cleanup
- fixed build process: avoid abort if a desired directory is already
there
- fixed: changed ordering of includes as discussed in the team