Move files from CVS repo; formatting;