New initial folder and files organization