Added initial folder structure.
Merge remote-tracking branch 'origin/master' into add-features
Moved files to features folder and fixed indentation.