updating readme

Updating license info and file/folder structure
removing kirki description
updating readme and solving conflict