Simplify directory structure

UI automation is rewritten for async pattern.