Merge pull request #19 from cwnidog/Sam

A slew of changes, including directory names...
SRC/ipsum.js moves to js/ipsum.js