Refactor context's to their own package