Frontend refactoring remaining files