Cleanup file placement
Allow cwd to be set on the fly