front-end structure reorganization