Re-order Reposetory and add folder structur