Update basic structure and readme