Deleted and reorganized some files