move to other dir, add some codes