Simplify directory layout and update readme