adapted src files to new interface
merged github