restructure folders and includes