Split encryption libraries and added interface - Note they are no longer static as a result