Restructure file orga