Neated the orientation code from config to bundle