Updated project generator to universal one