Moved some class to fit better there purpose,
Improved the card generator, the loading is show (WIP, not fully fonctional)