Change dir structure, update readme