Update file structure and readme