Simplify folder and update readme