Switched to Paket, smaller refactorings