New Structure

I've made a new folder structure for the files and changed the html markup a little.