Restructure a bit

It's an atom because I couldn't get service_status to be visible defined in uffda_dsl.erl