Restructure file and update examples