Relocate some files; update includes