divided to files and updated csproj