Update to clena up file layout and add text