Reorganized some files