Restrukturierung Librariy
Merge branch 'dev-client'