Refs #1 reorganization of files