Finished serverside modularization of statemachine templates