Moved BuildContext to a new file