some reorganization of files