Initial commit of new modules environment manager code