Adding changes to allow for modularizing server and controllers