Finish with the entity file structure. Start to remove hooks relate to entity API from d7.