Directory restructure.
Fix build, does not link.