improved ui, cleaned up folder structure