small fix; enhanced directory structure