Merge "dali-adaptor internal folder refactoring" into devel/master