UI improvements and restructuring the folder