Merge "proposal for tempest directory restructure"