Moved Comm library into main folder