Add files & cleanup