Created basic directory structure
Added basic Tupfile for demo
Refactored Tuprules.tup
Merged upstream/master