changing folder architecture including numbering scheme