Starting some folder structure for review.
Fix conflict.
Merge pull request #5 from AdorableMallow/master

Starting some folder structure for review.