Entity tagging and layerize ready to use

Entity tagging and layerize ready to use.
Component adding in course.