Added missing files
More cleaning up!