Moving source files from base subdirs into tests/ and tools/