Move SVC files to main project