[AMC] Fixed issues caused by refactoring different services into different directories