Update to file structure and readme