Modify all files to use new code layout