restructure directories with _components