Move files to subfolders; update Makefiles.