Updating unbinding classes
Extract headers into separate file
Extract headers into separate file