Fill in readme and reorganise structure