Split out services into separate feature files