Changed directory stuctor and synced OSI core