Move most files to packages that seem more appropriate.