Merge "Move files to new directory structure of framework services"