Added base files.
Merge branch 'feature/base' into develop