Modules and NS organization + comments