Changes to project structure and README