structure updates

structure updates along with improved includes template file

blueprint training-manuals

Change-Id: I022722254105e5ec2008927947e04f95a7f22a26
Merge "structure updates"