resturcture all dirs to automate the whole flow