Did some organizing of code & files.