directory structure change and commenting