New repository structure
Readme fix