Updated the links so it does not need mod_rewrite
Merge branch 'newStructure'