Added modules and default & dev tasks