moved header files into contract/ subdir
updated header inclusions
Merge branch 'feature/header-namespc' into develop