Reorganize front end