Seperating out code into modules