Nuget package restore enabled
Enum rename + putting right things in right directory