Changed structure, added Grafika