update file structure

adding includes and chopping up html/css blocks