change the folder structre to align to original project