Added proper project structure so as to enable to production of a static library