* Added some card main types and re-arranged them a bit
* updated todo.txt