Moving code to a separate module