Move some assembly functions to separate module