Changing modules around to better fit demo