Work on splitting up modules and adding factory services