Restructuring and adding additions

Hey dude,

I made a few changes in file structure, fixed some small bugs and added some additions to site.css. You should review before we merge - you might have some thoughts on why I restructured some things differently.