Add and rename files
Build OK