Add files and fix to match skyway