Split module up a little more