Added calculation files, sort code, ...