Basic Structure

Starting point for dev.
Merge branch 'master' into IR