Modified file structure. Update readme