updated all files to new style