Changed the architecture for the files .
Modified (not completed) committed files .
Still work to do guys !
Merge branch 'Card' of https://github.com/GP-S/HOTS into Card