reorganized some files