#64 Split angular controllers and services into separate files