Add wrapper folder
More clean up