Deleted empty files and renamed some better