Tide up folder structure and adding all new