Reorganisation of code into multiple files finished

- added own class for handling CID/CIDLOG entries
- more restrict imports