Changed module structring and grunt tasks