more organization
more changes. with static file display and other template stuff