a little housekeeping
major reorganization of files