Reordered files
Updated code and added timing info to script