Added module constructor and re-ordered dependencies