Add chart and overveiew matrix windows. Change project structure