Reformatted, added missing files