update code layout.
remove current directory dependency.