Added newlines, more dev files, rename fix 1/2