Better code structure. New methods for header and content parse. More tests