Reformatted and added some new files