Fix: remove unused files
Fix: clean code
Fix: possibility to add another header type