Migrate common components to one dir