update to fw1 v2.5, and di1 to 0.5.0
move services under model dir