Reshape directory layout and update README