Reorganize, clean stale file