Moved raw context stuff to appropriate folders