re-org of files and process.