Rearrange the folder structure and split services