Moved index.rhtml into pages directory for cross-sample consistency
Updated clean target to remove work directories
Updating samples