arranged folders for publish to Azure
More folder arranging