Style a little
Split out services into separate files