Beyo and App loader refactor