organizing: add more folder and files