Changed structure and added synced OSI core