lots of moves to contrib folder and creation of omega and dvcacomega subtheme