Enabled NuGet package restore
Refactored app for consistency