Init directory structure
Merge remote-tracking branch 'origin/master' into interface-basic