Move 'services' to 'common' folder