Some new folders and files reorganized