moved ubuntu to 2.1 package and unified config