Redo the React structure - lots of stuff missing