remove Context interface... it doesn't help much
Split headers/code