Add React
Clean up structure