Dk

Card controllers and views are messy and incomplete but shouldn't conflict with anything. 

Primarily moved things into their own files, so it's easier to navigate and figure out what has to be done.