Directory restructure.
Fix build.