Add project file
Few changes according to submodules