File reorginization and beginnings of helper methods
A few deck managment functions, template rendering and CSS fixes