Library - step one and half

- Moved header files to separate filters + did some renames.