Moved Into Package

Also updated demo as a result.