[Fit] Change solution files structure
[Fit] Build error fixes