Merge Echo.Control and Echo.App