seperated modules out and updated library versions