Major update. Code cleaning, card's dirs arranging