rearrange folder structure and prepare for production