Restructured native code into seperate namespace, startet window design