Added: Put in basic file and folder structure.
Merge remote-tracking branch 'origin/master'