Refactoring and fixes

Fixed building of desktop project, now I must test other ones
:cold_sweat: