Restructured the projekt