Updated base files and dev deps