Merge "[CONSUL] Move components to component dir"