restructure folders and modify about