edited/reorganized some files