Reworked file structure and consolidated main screen